From: Kenichi Handa <handa@m17n.org>
Date: Thu, 30 Apr 2009 04:41:39 +0000 (+0000)
Subject: (fontset_find_font): Check if rfont_def is Qnil or not.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~702
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c7498a0edc1ea42408812bac6f26a0a06b400cdd;p=emacs.git

(fontset_find_font): Check if rfont_def is Qnil or not.
---

diff --git a/src/fontset.c b/src/fontset.c
index 3eb835401f2..bd9f719423a 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -547,8 +547,11 @@ fontset_find_font (fontset, c, face, id, fallback)
 	for (i = 0; i < ASIZE (vec); i++)
 	  {
 	    Lisp_Object rfont_def = AREF (vec, i);
-	    Lisp_Object repertory
-	      = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
+	    Lisp_Object repertory;
+
+	    if (NILP (rfont_def))
+	      break;
+	    repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
 
 	    if (XINT (repertory) == id)
 	      {